Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Jul 2010 22:54:46 +0000 (22:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Jul 2010 22:54:46 +0000 (22:54 +0000)

Trivial merge